Auto merge of #1687 - huonw:dev-dep-doc-test, r=alexcrichton

Previously a dependency cycle like `a` <-(normal)- `b` <-(dev)- `a`
would mean that importing `b` in `a`'s doc test would fail because the
original `a` library was not found.

Fixes #1686.